Fix
Merge
Merge + graph
Add calibration
Calibration done