more opt
Merge branch 'computeactivation2'