A little more catching up and enabling "experimental" options