Clean Version with  Service and Counter + bug fixes