Modify 2 problems in lab2