updated lab
merged