Added find next optimization and test routine.