final changes retested