Rework due to code comments.