Updating SHIVA code and adding Sam's fix for Timeglider popups