First cut, major revisions