//my code and replaced w/ Aaron and I's code