updated unit 6, 7, 8