SF ~2.6 update