final changes minus links