Updated to the new lab structure