total fixes of the 2 lab