[A] Analysis Tools Imporvement

Added improved analysis tools.