changes copied from lab machine