Major revisions for release 3.5