more changes from challenge 1