Done. And added some factorization around that.