Added some needed things that I forgot