Now lab 2 is also updated, needs checking.