Making the finder more effecient