Changing stuff from previous commit to a method that actually works. :P