Added some things I missed