new stuff and fix of pp