modified Authservice