Renamed a couple of methods, maybe something breaks... I'm tired...