Refactored responses so counts are automated