Added the functionality for the demo