Update after code review and regression test. Ready for publishing.