values factorized
method changed
Merge branch 'area-opti'