removed fields i think are messing up the model