Added both cases now