Lab 6 - updated