minor changes by amr