Reformat MOP with new questions