fixed models and ready to deploy