changes after review by Sarit and Ariel