Integrates Camille's feedback