Encapsulation

// Ethnio survey code removed