changed by laxman
Merged file