Ok, I'll move it to a different PR