Adding cala and case statement