Updated Demo App