Updated Demo Project.