added changes for proper message