This seems to be workimg better now