Adding P28a and P28b
Adding S99, P31
Adding P31
Adding P32
Faster implementation