Changes again

Sorry if this breaks anything! Had to clone my local again and make the
changes by hand; I shouldn't have removed anything that I didn't before.