add feedback from Guido