Lab 3
Merge lab 3