CF custom order (updated)

I have removed unneccesary ordering.