Added security, but it doesn't work yet