Made some changes to make lab better