Updated files to work with WIP merciless tag rather than local vid