calibartion done
merge conflict fixed)