new (untested) version for faster integration