Revised authentication some