made option to skip charge generation work

Change-Id: I03df44e1c0555f684847555558f7b775bd0cd5e9