Forgot a couple of bits