Removed Encapsulation.
Various changes.