final changes after testing