Update code to match metube-7