initial changes for BATCH-2001