moved it into the application helper