now stashing is handled cleaner