Updated fields, test before commiting damnit