adds more robust searching