Please unit test this new functionality.