Rework after review.