Added proper-finding to BTN