addressing Fernando's feedback