added new functionality for demos