Partially added HD analytics. Continued refinement