Try to make stuff less Unsafe