final commit with most calbration stuff