Added Johannes' comments.