Added some things I should have added before, forgive me