Improved the finding feature