yes, but if other methods are not doing it, a separate PR is probably better