Modifications made in class...still passing all tests