Visual

Merge changes in visual