Addressed review comments. This now needs a re-test.