Updated shield (ready for production)