base finding logic added