Incorporate new functionality