Added target value calculations back in