Updated Security Controller (draft)