Added proper-finding for BTN