Add _calc optimization