stripped out -pre in preparation for merge