Minor adjustments + first data recording