Should work for most cases now