Get rid of SOC calculation to improve performance