Updated Demo Project