Merge Shaul & Eyal changes in design doc

including future improvements and changes