updates for FX tweaks from Gin