Added functionality to Messagegeneration
Solved conflicts