Modified proposal.

Made changes that Laurie suggested