fixed up the ordering of the fields