Fleshed out HD architecture changes