Continued work on FIBD