More CFX stuff.

I really shouldn't do this when tired... I tend to forget things :)