#7 working on issue 7