Upgrading further to vs12