my adjustments after Sagiv