Yes, I thought to do this is a separate PR after this one.