Shield Guard/Refactor