address more CR feedbacks