edits from Can and Markus