change for excluding fields