pulled latest FDM changes from bitwisetech's fork