Updated strategy
Merge branch 'dev'