8.5.4 finished