@dbu, @lsmith77 : can you check the current code ?  you can also refer to the unit test to make sure I get it right !