final changes before migration