after cr fixes - part 2