changed Design and updated Proposal accordingly
missing at last commit