corrected merging of FDM and Green