Fixed Greedy Strategy to work with new Rules