implement Aurelio's comments