updated from lab master