Long-awaited CR changes