Code and demo updated