Or actually since this is not part of this PR maybe handle it after this one merges?