Final changes before re-design.