(Unstable) Added logic security