i agree but we should be doing it massively in a main PR maybe