refactoring work on pickup plan only