first changes for shielding