CR comment addressed