Updates to assignment1