Took most of your changes and merged back in some language that had been deleted from version 2.