Refined enclosure design