Eloborated the model a bit