Addressed findNext  feedback