Updated to add total count