Changes to assignment3