Fixing Visualization refactoring. Not done yet.