Organization
Arithmetic optimization bug fix
Better improvement of arithmetic optimization