changed to 2.7; fixed up merge