Update of Lab 2