Update patch, based on feedback from Gerd