IndexCalc now free from using views