updates to analysis and ms
merge