Updated calc method