Cleaned up branch to include only one proposal.