next gen calculation fix(es)