working draft of API-v1 fix; needs batch update logic check