added manual condition handling to find method