Added support for some better FX