Updated for current CF