Kostas - change find policy.