implemented Jorge's feedback