Minion logic
Merge branch 'pim'