changes in controllers and models

PR