Counter fix

+ moved numbering to another branch