updated equations to match *v2 storage model