Demo improved with resolution of conflicts and UI behaviour.