final round of changes