yet more rewriting of putway...