Calculate method updated