made option to skip charge generation work

Change-Id: I600c969f25ffa5db6165388f0b55eba112110b22