First part of changes for HW4 Part 1