Bring lab3 changes over