C-FIND now working