Lab2 fixed