Added Additions and changes from Pradeep