Darren is silly and caused merge conflicts part II