I don't mind a separate PR.