Updated for choice of video