Update 7

Changes by SvZ (as per Afr)