Major revision for 2.1, first review draft