Some small modif and new tasks for the PNA.