8.5.1 and 8.5.2 completed