this seems to be working better now