Final changes to design doc