bring up to 2.5 beta