Modified files to reflect exercise 8-3 (not working)