added back iteration counter
fix conflicts