Changed some things at hw 2