Added Counter, Some changes