Put most of the sprite stuff back in