In the middle of Sabah's concerns

Almost done. Applying changes to the rest of proposal.