Updating to Martin Rosinski’s v1.7