Improvements to FIG orchestration

Whats wrong with this port?