Worked properly it for now

1. still have calibration problem