Sponge pushed a lot of updates out, so here's some updated code :D