Finish 2-1 and 2-2
Modify debug project.