I agree; the new code looks good.