Feedback from Jaap added