Updated things a little