ISSUES 1 AND 2 PASSING