Change signal for numbering from * to %numbered, save more code:-)