cookies handling changed