Added some things, I forgot what