changing auth. method
fixing merge issue