Updated Content

Partially implemented