Taking carljm's requested changes into account.