Model updated; several controllers