Refactored to reflect changes in the strategy class