MERCATOR: major maintenance