Updating code that I broke. Naming too many things by the same name is a bad idea ;)