If you want to do that it can be a separate change though - i'm happy to merge this into the main PR.