Updating to latest copy of code

Some how the revision with these changes was gone and it had some patching for Paul.