Fix and Flow (for marimba)