fix step6 and step5