changes to lab 2&3