moved the threat/warning from the end of setup to the end of index