Ok, will do it in a separate PR.