Updated Design Doc