Final updates. Fully MVW compliant