MainStrategy written
Merge commit '72a6'