reformat for the new master