Add scaling to non-batch demo mode