refactored find methods