Changed Controller & Models