Modified the model a little bit