Added support for comedy clips