Changed default strategy back to 1, and tidied