implemented FC core enhancements to source