Final (failing) tweaks.
Credit where credit is due