edited auth and handler to work