After refactor and stashing.