final changes b4 cdfa