Added switch to select batch size