Modified Lab1 Lab2 branch