Reverted demo to working version