Improve units 7, 8, 9