WIP improvements to analysis