Feeling good about this edit. cc:Rage