Improves Demo App