Please Pull These changes

Check the commits for more info