Adding some new functionality.