tidied up the fco mappings