Minor changes, working counter