Made new calc methods