Jonathan
update fields missing, make some fields into objects