[Unstable] Further work on CTF