Encapsulation and fixes: