ADDED: Allow for non-sandboxed execution