For the Hypertech, yes, that is my understanding, Hypertune or stock tune. It would probably be a good idea to get it on a dyno and see a) how much power the HyperTune is really giving you, and b) check out your A/F.
IMO, my car runs so well on 87 with the factory tune, I wouldn't get an...