else statements
Merge branch 'auth' into dev