TODO updated
Counter columns refactored