update notations, make configurable