I also have the most recent Amazing Charts version and I have no G-Q or J-codes. I guess I would have to add the J-codes for the injectables and G-Q codes for Medicare patients, right?