graphical changes, minimal
merged