changes to lab
fixed merge