corrected issues 2 and 7