Proposal revision - Sabah's comments (in progress)

Finalizing the incorporation of Sabah's comments