Initial rework.