Made count use numbers instead of strings