Upgrade to sf 2.5