Resolved some of the Analsis issues