addressing comments from Matteo