Untested changes to improve visualization