Lab 7 updated version