Changed model a lot