Upgraded security, ready for pull request