Refactored the first wander