Revised after Dan's Comments part II