Merged into sfi.py