Added the new functionality.