First shot at issue #2