Okay I'll add a separate PR so it is not lost