Spork's changes