Updated things I copy-pasted