STUPID GIT MERGING CRAP
Some more updates