Changes we made to everything in 3 hours :)