My second set of changes