Merged the design doc