Fixed Demo Project