added interpolation and moved index up to calib class