First version that works after pair programming with Fare.