I guess we'll need to do this before the stash too