Using correct fields now