revise according to Adriana's comments and Ofer's comments