allow to add jokers any time and re factor