works for the cases now