iTB and iSTB Enclosure Design Improvement