Fix pid matching
Add chapter 13