changes in handler