minor changes to support different video sets