added hybrid auth