I don't see why we removed this... now it seems we will be computing this value every time?