Added Markus' comments