structure changes - mostly tokens