added SFF support