Before removing the resvar calculation