Tweak to not use eval, and display fields in different order