Removed TODO about jokers