Merging in critique from December 2