update the demo according to Miguel
update the references as suggested by the editor