overhaul to use to-no-case