New version for net40