without country
it seems to work
works
some cleanup