Adding upstream and downstream shielding