Update Lab2 (having bugs)