either way seems like it has nothing to do with the current PR and should be done/discussed separately