Review and changes from Jocelyn Fiat

Exactly