better comment, update unit test a little bit