added more functionality for demo