started adding ids to all the fields