Incorporated comments from Hauke Mehrtens