change order of fields and methods