Added full ondemand viewer and highlighs