fold in Shai's feedback