added find optionality