should handle most cases now