Initial changes for assignment #2