Update for Shachar and Shahar