Sprint2: another user does another improvement