Switch from mutex + increment to atomic add