FDM Improvements