added ff support