Partial progress on step4
Finish step4