Added enclosure and 302