upgrade to sf 2.5