Finalizing new models
Much better model approach