changed model a little