edited zpc TODO a bit