More lab solutions and changes