Added some controllers and changed the flow