changed the normalHandler