updated controller, updated schema