Basvi- Changes

Standalone CFF