Change to use full dictionary search instead of combinatorial search