Edit items process refactored