Fixed up the model a bit more