Complete Merge of FM and EM