Should I modify that now? Or should I do that once your PR is merged?