Major revisions for AUTH