Luigi's revise
my revise
a few small changes