rearrange a bunch of stuff for compatibility with zamboni