Changed order of fields and added strongarm values