Work in progress
Fixed FI issues