added more features to the demo