Changed to a better way of counting votes