more careful stashing