add CASE flexibility