try without case
Revert "try without case"

This reverts commit 172da1afddd9f2880aaf5670ec163152835ef4bd.
move to my version of case