WIP CF9 compatibility