BS2 unit 7 and 8 edits