More updates to Analysis