My changes

Equivalent to the changed done on Master. Dunno how to use Git Yet :p