Changing how constant search works, not sure it's any better than it was