safety improvements

The Guardsman