Chang retry decorator, add video count