Re-added some stuff
In my previous commit I removed some things that needed to be added back.