CR changes: make it more consistent