daniel and demo updated