some changes to prepare to run on the lab machine