after CR fixes