Added triangle strategy, and automatic strategy state selection/transition
Correction