adding mass text capability
fixing conflict