last edits based on feedback from Elisabeth