- redid security (almost done)