Changed code to reflect new strategy