fix the models and make it works