more analysis changes