Push back on SFX change

working off of dev branch