Changes done by akhil
Some things
Some changes made by sid