Redid some things that I accidentally reverted before pushing