SFX related code changes