Added Features to Demo