chaneg in message handler