Updated a couple of bits