preparing upgrade to 2.7