Changes brought up by /u/HurlingPoop