added new functionality2