Update to work with new lab setup