Bug 143 Update based on review comments