putting things in the right fields