models+controllers updated