removed message_generation dependency