Review and changes from Jocelyn Fiat

on TESTING .. I just updated the call to match new names
I didn't tried to run it.