Did some work on authentication process