changes from lab, with work on exemplarish stuff