And now "by the book" with P2 categories updated by command-line...