Fix issues in lab, changed variables to sample