Harmonization for coding and some performance tuning