Will move this as well to new pull request.