re-enabling and improving security