Improve counter