6.0 brez display changes, first pass (untested)