Final implementation of advanced calibration algorithms

Summary
Final implementation of advanced calibration algorithms