Second commit with current analysis tools