Final? draft

Sending this version to Pietro
Changes from Pietro