Re: [PATCH 00/47] Batch update and refactor