added underscore and resolve in main controller