Added Charge/No Change

Performance improvement changes