API tweaking so that the calls flow through