Updated visualization to handle different drawing mode