Update to sf 2.4