Modified clip to match new handler_util library