I had entirely too much fun changing this :)