Revised proposal based on Jason's comments 1.