final round of changes.