Updated Demo app