Updated uCFO to work with newer code (filters, etc)