Added the new functionality