Community asking for changes for safety

Community asking for changes for safety