edits based on andreas' feedback