Changes made
Some more changed