Having strategy added correctly to all functions