Updated lab solution