changed model. just need debugging