improvement on video switch mechanism