started to modify loading to include web api.