committing the better version of hw2