* changed api_key handling