Some code changes - Counter added