Refactored FKDM