SFAC improvements