a few notational changes