edited from view and from controller, adding instance variable and text