Some analysis file changes