Total count working, current buggy
merge