First round of CR changes (partial)