Lab2 and lab3 changes