added fd support