Updated Analysis and Design doc