Adding shield & fix