revised following the advice