Fix1-branch - new vis changes 29.10.14