update: ondemand + interactive from google source