Yes, but you don't need all the p/q/g/x/y examples for the cases you're skipping, so trim that down where you can.