latest changes
presentation demo
fix merge problem