modified the controllers to do their jobs ;)