I took most of your changes and merged back some language that got deleted from version 2. You can use the automatic side by side compare if you want to see what I changed.