More changes in effort to make api calls work