updated controller methods and form