[Oct 25] - prepare to support FD