Some more edits to prevent any security holes