add live guard adn media
merge