slightly better version, but auth still breaks"