Problem #2 solved basically