Resolved 1-2a (this time for real)