Adding a fix to analyze.cc
Adding Some modifications