Rearrange stuff for using stasis