added to more functionality user_helper and optimized more code