Updated shield usage - much better