FIXED: Using case in new syntax