Merged all the changes
Commented out invalid lines