First incarnation
PP version
Synch from cvs