updating per Itamar and Danny comments