Clean version of the model, still not working