combining versions 2.5 and 3.1 into this repo