Dev security

We want to merge with staging and have fixed all the previous edits, please let me know :dancers: