Updated for Lab 1