Update of Bill's code to fix issue with videos John had