seems to be working find now, but need more testing