After you. No, after you.

This commit also includes solution changes.