Safety issues

...waiting