Mac2 changes