Added some things that I had forgotten to add