incorporated Oscar's feedback