Reorder to put required on top