New strategy to master

merge and delete