Updated for Credentials-Sprint1