refactor fidx?