adding current calc functions