updates to new APIShim