changed around the models a bit