changed model methods and controller methods