Updated lab1...again