I've made some slight changes
FINISHED FIXING OUR MERGE FEST