more changes to match new analysis