Assignment 1 - update 3