more FSI WIP