CR recent changes

Taking your comments into account.