Finish 3.3, #7
Finish 3.4, close #7