added temporarily disabling fields