All the prototypes restored. Notifier conversion fixed