improving batchmaster