Updated with critique information