Added controller and updated ga