I would #2 in your #1