Please add unit tests for this new code.