Update 1 Design doc