new version, consolidate api_key location