ex 07, with change after hanan's commin on ex06.