rename line counter and rework