Updated Analysis Tools