Trying to fix Security