more voltage and oc fixing not worked, merging to revert