incorporated most of the corrections sent by Felix Winter