More work on challenge 8