Minor changes from Lab1