step 6.9 - minor enhacements