second commit, before submit to Pr. Duncan