finish 5.8 and 6.1