Added feedbacks from CEM 2.1