Track our calculator

Change-Id: I128722f6eaf20d93d22f68036a73270e3972c896