demo and daniel updated