Re-Thinking Shanghai Proposal