Addressed norman's comments