FIX: simplifying sigma2 computation