Dipanjan

Rework partly done..