Edited: Model and Controler