The usual updates and updated notation in one spot