Fixing Demo project