final changes after email