Unit 8 added, plus more