Last optimization for incremental accuracy and performance_

Last optimization for incremental accuracy and performance_