Added some new functionality for testing purposes only.