Solved #2 again.
CHANGES