rearranged and added fields to PowerSchool