#ex2 edits